Update patches

diff --git a/debian/patches/install-data-file-to-meet-need-of-multi-arch.patch b/debian/patches/install-data-file-to-meet-need-of-multi-arch.patch
deleted file mode 100644 (file)
index 4394c9c..0000000
--- a/debian/patches/install-data-file-to-meet-need-of-multi-arch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: install data file to meet the need of multi-arch
- Install data files to ${CMAKE_INSTALL_LIBDIR}
-Author: Aron Xu <aron@debian.org>
-Index: opencc/CMakeLists.txt
-===================================================================
---- opencc.orig/CMakeLists.txt
-+++ opencc/CMakeLists.txt
-@@ -69,7 +69,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
- set (DIR_INCLUDE ${DIR_PREFIX}/include/)
- set (DIR_SHARE ${DIR_PREFIX}/share/)
- set (DIR_ETC ${DIR_PREFIX}/etc/)
--set (DIR_LIBRARY ${DIR_PREFIX}/lib/)
-+set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
- 
- if (DEFINED SHARE_INSTALL_PREFIX)
-   set (DIR_SHARE ${SHARE_INSTALL_PREFIX})
-Index: opencc/src/CMakeLists.txt
-===================================================================
---- opencc.orig/src/CMakeLists.txt
-+++ opencc/src/CMakeLists.txt
-@@ -83,8 +83,8 @@ endif (CMAKE_BUILD_TYPE MATCHES Debug)
- install(
-   TARGETS
-     libopencc
--  LIBRARY DESTINATION lib
--  ARCHIVE DESTINATION lib/static
-+  LIBRARY DESTINATION ${DIR_LIBRARY}
-+  ARCHIVE DESTINATION ${DIR_LIBRARY}
- )
- 
- install(

diff --git a/debian/patches/lib-name-match-soversion.patch b/debian/patches/lib-name-match-soversion.patch
index 1845f8e8f134535c2686f647d16f827e24c9595a..26fd8f7b780d751bb28944fe11108ce7d89ccc2a 100644 (file)
--- a/debian/patches/lib-name-match-soversion.patch
+++ b/debian/patches/lib-name-match-soversion.patch
@@ -4,7 +4,7 @@ Index: opencc/src/CMakeLists.txt
 ===================================================================
 --- opencc.orig/src/CMakeLists.txt
 +++ opencc/src/CMakeLists.txt
-@@ -68,7 +68,7 @@ set_target_properties(
+@@ -72,7 +72,7 @@ set_target_properties(
      OUTPUT_NAME
        opencc
      VERSION

diff --git a/debian/patches/series b/debian/patches/series
index de7439aba55ce04a38e7443a47cc0408a57c0903..fe4adf11c95b05daee1e8f973305e79301db4725 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 lib-name-match-soversion.patch
-install-data-file-to-meet-need-of-multi-arch.patch
 use-system-libraries.patch
+use-cmake-install-libdir.patch

diff --git a/debian/patches/use-cmake-install-libdir.patch b/debian/patches/use-cmake-install-libdir.patch
new file mode 100644 (file)
index 0000000..31e6670
--- /dev/null
+++ b/debian/patches/use-cmake-install-libdir.patch
@@ -0,0 +1,13 @@
+Index: opencc/CMakeLists.txt
+===================================================================
+--- opencc.orig/CMakeLists.txt
++++ opencc/CMakeLists.txt
+@@ -69,7 +69,7 @@ set (DIR_INCLUDE ${DIR_PREFIX}/include/)
+ set (DIR_SHARE ${DIR_PREFIX}/share/)
+ set (DIR_ETC ${DIR_PREFIX}/etc/)
+ set (LIB_SUFFIX "")
+-set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}/)
++set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
+ 
+ if (DEFINED SHARE_INSTALL_PREFIX)
+   set (DIR_SHARE ${SHARE_INSTALL_PREFIX})

diff --git a/debian/patches/use-system-libraries.patch b/debian/patches/use-system-libraries.patch
index f05d926e9c201184bdff653eeab57bf37793a0da..1edb1ca87744be54a639f7ffcd90abae2c710321 100644 (file)
--- a/debian/patches/use-system-libraries.patch
+++ b/debian/patches/use-system-libraries.patch
@@ -1,12 +1,9 @@
-Subject: use system library instead of embeded version
-From: Aron Xu <aron@debian.org>
 Index: opencc/src/CMakeLists.txt
 ===================================================================
 --- opencc.orig/src/CMakeLists.txt
 +++ opencc/src/CMakeLists.txt
-@@ -43,9 +43,8 @@ set(
-   UTF8Util.cpp
- )
+@@ -1,8 +1,7 @@
+ include (GenerateExportHeader)
  
 -include_directories(../deps/darts-clone)
 -include_directories(../deps/rapidjson-0.11)
@@ -14,5 +11,5 @@ Index: opencc/src/CMakeLists.txt
 +include_directories(/usr/include/rapidjson)
 +include_directories(/usr/include/tclap)
  
- add_library(
-   libopencc
+ # Library
+